OcdFileImport: Handle emtpy area holes #2144
Closed
+12
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dl3sdo
commented
Mar 28, 2023
Member
Author
dl3sdo
left a comment
dl3sdo
left a comment
There was a problem hiding this comment.
Removing empty area holes should not be restricted to just one but be extended to multiple subsequent ones by replacing the if statement by a while loop.
There are .ocd files that erroneously contain an empty area hole, i.e., there are two subsequent points with the Ocd::OcdPoint32::FlagHole property. If such a malformed .ocd file is imported Mapper will crash if the area object containing the empty hole is selected. To fix this, the first of these .ocd points needs to be ignored. Since setPointFlags() applies the HolePoint property to the last point instead of the first point of the next part, the consequence is that instead of removing the first point of these two .ocd points, the second point of the two Mapper points with the HolePoint property needs to be removed. Using a loop ensures that multiple subsequent empty area holes are removed. Co-authored-by: lpechacek <[email protected]>
dg0yt
reviewed
Apr 13, 2024
Member
dg0yt
left a comment
dg0yt
left a comment
There was a problem hiding this comment.
Maybe I need some real or synthetical test data here.
| // the consequence is that instead of removing the first point of these two .ocd points, | ||
| // the second point of the two Mapper points with the HolePoint property needs to be removed. | ||
| // Using a loop ensures that multiple subsequent empty area holes are removed. | ||
| while (is_area && i < object->coords.size() - 1 && object->coords[i].isHolePoint() && object->coords[i+1].isHolePoint()) |
Member
There was a problem hiding this comment.
I think it might be better to use a separate loop (or STL algorithm) then to nest loops.
Member
Author
|
Kai, I'll send you files via email. |
This was referenced Apr 14, 2024
Member
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are .ocd files that erroneously contain an empty area hole, i.e., there are two subsequent points with the Ocd::OcdPoint32::FlagHole property.
If such a malformed .ocd file is imported Mapper will crash if the area object containing the empty hole is selected.
To fix this, the first of these .ocd points needs to be ignored. Since setPointFlags() applies the HolePoint property to the last point instead of the first point of the next part, the consequence is that instead of removing the first point of these two .ocd points, the second point of the two Mapper points with the HolePoint property needs to be removed.